Update to Groovy 4.0 #8010

timyates · 2022-09-15T16:28:24Z

This PR switches the Groovy version in core to 4.0.5

The internal plugin pulls in an old version of Groovy, so I added a dependency resolution block. This can be removed once the internal plugin is updated for Micronaut 4.0.0
Geb doesn't support Groovy 4.x. To re-enable the Geb tests, I have split these (one of them) out into a new module test-groovy-geb which runs with Groovy 3 on the classpath
Groovy no longer creates isXXX getters for Boolean fields (it does for boolean) -- this is discussed over here on the Groovy Jira, and a fix has been added to only check isXXX for primitive booleans
Groovy can no longer grab a self-signed certificate using the old sun classes. I have fixed this by adding bouncycastle onto the test classpath, so it uses that for the test
Groovy 4.x can no longer use the static methods on an interface declared in the class. ie: If an interface declares static void foo(), and Concrete implements Interface then Groovy must call Interface.foo(), not Concrete.foo(). This is an expected change -- I asked in the Groovy JIRA
inject-kotlin-test/.../KotlinCompilerTest fails with Groovy 4 as the Note for beans being created are picked up as a catastrophic failure by the test harness. I added a check to ignore Notes, as this is only under test when Groovy is creating a kotlin build with Kapt processing

timyates · 2022-09-20T12:53:11Z

I think one of the bugs I had to workaround is https://issues.apache.org/jira/browse/GROOVY-10060

See https://issues.apache.org/jira/browse/GROOVY-10060

…y 4/Java 17

timyates · 2022-09-20T15:51:24Z

inject-groovy/src/test/groovy/io/micronaut/inject/requires/RequiresBeanPropertiesSpec.groovy

@@ -111,6 +116,11 @@ import jakarta.inject.Singleton
 class Config
 {
    Boolean boolProperty
+
+    // TODO: Why do we need this?  Groovy bug?


Raised https://issues.apache.org/jira/browse/GROOVY-10762 to see if it's a bug

It's expected and not a bug, fixed in fd8d885

Still not sure why they are required

melix · 2022-09-22T12:35:52Z

buildSrc/src/main/groovy/io.micronaut.build.internal.convention-base.gradle

@@ -46,6 +46,15 @@ tasks.withType(Jar).configureEach {
    preserveFileTimestamps = false
 }

+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'org.codehaus.groovy') {


So while this will work to build and execute this module, this won't be propagated to consumers.

I think that's ok... It's only stopping the micronaut-build internal plugin pulling in the codehaus dependency here

Once micronaut-build is updated, I believe we can get rid of this

melix · 2022-09-22T12:37:01Z

inject-kotlin-test/build.gradle

+tasks.named("test", Test) {
+    if(JavaVersion.current().majorVersion.toInteger() >= 17) {
+        jvmArgs(
+                '--add-opens', 'jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',


This whole block is a bit scary!

I agree, but without it we get

java.lang.IllegalAccessError: class org.jetbrains.kotlin.kapt3.base.KaptContext (in unnamed module @0x7a4f0f29) cannot access class com.sun.tools.javac.util.Context (in module jdk.compiler) because module jdk.compiler does not export com.sun.tools.javac.util to unnamed module @0x7a4f0f29

All the way down until you end up with the above list. I think it's because we're effectively hand-cranking Kapt from Groovy, but I have no proof...

melix · 2022-09-22T12:38:06Z

test-suite-geb/build.gradle

+
+    testImplementation libs.geb.spock
+    testImplementation libs.spock.for.geb
+    testImplementation "org.codehaus.groovy:groovy-test:3.0.12"


Is this intentional that it uses an old version?

Yes, test-suite-geb runs Geb on Groovy 3 (as there's no Geb that works with Groovy 4 -- yet)

test-suite/build.gradle

melix · 2022-09-22T12:38:51Z

validation/build.gradle

@@ -15,7 +15,9 @@ dependencies {
    api project(":core-reactive")
    api libs.managed.validation

-    compileOnly libs.managed.gorm
+    compileOnly(libs.managed.gorm) {
+        exclude(module: 'groovy')


mmm, we should figure out why an exclude is needed here

libs.managed.gorm is org.grails:grails-datastore-core:7.3.2 at time of writing which has a compile dependency on Groovy 3

<dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> <version>3.0.11</version> <scope>compile</scope> </dependency>

This is just a compile only dependency, but we may be breaking gorm integration until grals release a Groovy 4 version of their libraries that we consume

sdelamo

Should we remove GORM information from the documentation?

Maybe add it later once there is a version of GORM compatible with Groovy 4.

Or add an Asciidoc callout?

...-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/HttpResponseSpec.groovy

inject-groovy-test/build.gradle

inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyClassElement.java

inject-java-test/build.gradle

sonarqubecloud · 2022-10-07T09:13:59Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

50.0% Coverage
0.0% Duplication

timyates added 13 commits September 15, 2022 16:25

Switch to Groovy 4

7cd6033

Comment out Geb for now as it doesn't support Groovy 4

f4a9205

Workaround bug(?) in Groovy

b0a409d

Accept api changes

a96fa0d

Fix VisitorContextUtilsSpec

6db1c36

Workaround same bug(?) in Groovy

f175865

Another Groovy change?

d8bad79

Workaround same bug(?) in Groovy

e95de04

I think this test was wrong...

ba924e3

Workaround same bug(?) in Groovy

ed0101f

Workaround same bug(?) in Groovy

cad3504

Workaround same bug(?) in Groovy

74a608b

Workaround same bug(?) in Groovy

cdc1cff

sdelamo added this to the 4.0.0 milestone Sep 16, 2022

Open JDK modules so Groovy running Kapt works

ce46c39

timyates added 4 commits September 20, 2022 13:54

I think the Kapt/Spock issue is a bug in Groovy

80eb7b5

See https://issues.apache.org/jira/browse/GROOVY-10060

Merge branch '4.0.x' into groovy-4.0

e3fe1e8

Open java.base/sun.security.x509 for secondary server test with Groov…

bc225b9

…y 4/Java 17

Don't open, add bouncycastle provider

e9c1e49

timyates commented Sep 20, 2022

View reviewed changes

timyates added 9 commits September 20, 2022 18:01

Fix GroovyClassElement for change in behavior for Groovy 4.0.x

fd8d885

Remove requires now we provide bouncycastle

eb6655b

Fix dependency substitution for the internal build plugin

3eb90e2

Move Geb tests to a separate module

e6d2bdc

Exclude groovy from Gorm dependency

6527aa0

Reinstate Kotlin inject test and add-opens required modules

25998ef

Still not sure why they are required

Only open for java 17+

4193060

Merge branch '4.0.x' into groovy-4.0

0a16e5c

Stop throwing assertion errors for Notes with Groovy 4/java 17

b3d528b

timyates marked this pull request as ready for review September 22, 2022 12:06

timyates requested review from melix and sdelamo and removed request for melix September 22, 2022 12:06

timyates self-assigned this Sep 22, 2022

melix reviewed Sep 22, 2022

View reviewed changes

timyates added 3 commits September 22, 2022 13:45

Remove comments

dfdfd3b

Mention Groovy 4 in breaks.adoc

d1d8346

Add Geb dependencies to catalog

43155fd

sdelamo requested changes Sep 23, 2022

View reviewed changes

timyates added 2 commits September 23, 2022 11:52

Move Geb specifics into Geb convention plugin

254d83c

Switch to lower-kebab case

bf97d12

sdelamo approved these changes Sep 23, 2022

View reviewed changes

sdelamo requested a review from graemerocher September 23, 2022 11:02

timyates requested a review from melix September 26, 2022 09:48

melix approved these changes Sep 26, 2022

View reviewed changes

Merge branch '4.0.x' into groovy-4.0

540f498

sdelamo merged commit ec42b98 into 4.0.x Oct 7, 2022

sdelamo deleted the groovy-4.0 branch October 7, 2022 09:41

timyates mentioned this pull request Nov 16, 2022

Migrate core to Groovy 4 #7965

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Groovy 4.0 #8010

Update to Groovy 4.0 #8010

timyates commented Sep 15, 2022 •

edited

Loading

timyates commented Sep 20, 2022

timyates Sep 20, 2022

timyates Sep 20, 2022

melix Sep 22, 2022

timyates Sep 22, 2022

melix Sep 22, 2022

timyates Sep 22, 2022

melix Sep 22, 2022

timyates Sep 22, 2022

melix Sep 22, 2022

timyates Sep 22, 2022

sdelamo left a comment

sonarqubecloud bot commented Oct 7, 2022

Update to Groovy 4.0 #8010

Update to Groovy 4.0 #8010

Conversation

timyates commented Sep 15, 2022 • edited Loading

timyates commented Sep 20, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sdelamo left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Oct 7, 2022

timyates commented Sep 15, 2022 •

edited

Loading